Fixed all the stuffs