Some cleanup as well as proper handling of zoom scaling and what not, much more restructuring and clean up to come.