Several more updates
 -Erik
13 files changed