Fixed some of the