Multiple fixes.
Removed unnessarry comments.

Clean up some other spots.
Merge pull request #32 from nbutton23/parc-errors

Fix errors introduced when we switched to parcelable.