Small tweaks and things I forgot