fixed up a few last things