Fixed a whole bunch of issues and styles according to issue #95.

Fixed a whole bunch of issues and styles according to issue #95.