A few tweaks and explanations