Re-applied changes from #747 on a clean branch
Cleaned up the existing guides