Fixed some things....