Updated to production version and added comments