added some more stuff
changed some stuff