tweaks and bug fixing