Added and changed some minor stuff