mixup jshint and more misc cleanup