Several changes, see README.md