Added removed and changed some random stuffs