improvements

Please accept this pull request, so I can accept yours