jshind fixes
cleanup