added lots of pull requests, mostly