Tweaks and fixes

a few minor changes, still works