Fixed buggy code and stuffs...