tweaks and fixes
tweaks and fixes