A few tweaks and comments