Some updates, notes and fixes