Fixed some things 2