Fixed a few comments, spacing, administrative stuff :)