Update with latest improvements.