merge carandraugs fixes to manual text to remove warnings and errors