updated docs
fixed a bunch of stuff
Merge pull request #339 from topcoat/update-docs

Update docs