Fixed a lot of stuffs