Comments and Polish

Just finalized a few things before handing this in.