cleaned a bunch of warnings