clean up a few things...still tons more to clean up