Small tweaks and notes