Some pull request

Lots of stuff