Update with a few fixes — still a lot to improve