fixing jslint bugs, try not to overwrite