Added and fixed and changed some stuff