More comments!

Ready to submit