fixing #28 and two semicolon-related jshint warnings