Fixed a few stuffs