Fixed all the things :')