one warning in guide and other tweaks