Some updates, done for the night I think