cleaned up a few last things