Update with lots of fixes
Update notes