Small tweaks and corrections