clean up a few things...