Small tweaks and comments