added lots of new stuff
added lots of new stuff