major cleanup
another huge change-pack
another rather big chunk of wokr
junk removed
cleanup in templates, and some other awesomeness added
one more thing...
further cleanup