Edited a few stuffs