code cleanup and visual enhancements
more crap fixes