Added comments and cleaned up a bit, final commit for Thursday night.