[FIX] a bunch of warnings and start to clean things up