Implemented some of the suggestions from the design drafts.