Comments and Tabs

Added a bunch of comments and tabbed out a bunch of stuff that we
should have indented correctly in the first place.