Content cleanup and error code addtions
Merge pull request #42 from chrisprom/master

Content cleanup and error code addtions