jshint fix
Various fixes