Small fix, few tweaks, and comment