minor updates, please read commit messages