Polishing, minor bugfixing.
Well-commented and cleaner code. 
Ready to begin sprint #2.