Fixed some stuffs!