made some headway on jshint issues