converted some to SLIM, other refacgtoring and fixes
switched a few more to SLIM, other stuff
just some clean up