Fixed a few last things..