various new features and fixes
tweaks and fixes