tweaked minor stuff
more tweaks and fixes