tweaks and fix