added some more stuff
Merged