Covers work done at the 'Codathon' event at Diamond.

Created by: pheest

I've made a point of making seeking to make one change at a time per file. Noted: several files previously had a mixture of TAB and space indentation. I've converted tha affected files to use space indentation only, before comitting the desired logic change.