cleaning up and checking a few things