few tweaks and comments