Update with new features, minor corrections