mostly done. cleaning up for submission. gedit bug stil plaguing me...