added some more stuff
just merging