changed some stuff worked on some stuff