fixes according to pull request comments