Small tweaks to code and package notes