Fixing up merge branch; fixed lint_on_load, which is nice