Implemented some of the simpler changes from our meeting