Several updates. See changelog in README.md