whole bunch of cleaning up. probably screwed up a lot of the functionality but the interfaces needed some attention.