Update header, fix tests, clean up JSHint