guide: tweaks and corrections