few tweaks and fixes