Fixed Stuffs

Fixed some stuff