Andrew

Sorry for all the minor commits, kept finding small things that needed to be changed.