added and changed some stuff