fixed a bunch of lint problems