added lots of stuff to master