Fixed some stuffs (Dont mind this)