Fixed some OOO bugs after some testing