added and deleted some stuff