changed some stuff
added more stuff