pull request to close a  few issues