tweaks and fixes

minor stuff