pull request

Here are a few more issues to close