Some updates based on working on Sirius - nothing major