Addressed issues 1-10 of Ticket 14 (Fred's comments)

Note: Issues 11-28 have not been reviewed!