more lints todo

here are the rest of the lints to review, 
will be splitting them up but maybe you want to cherry pick them.