Improvements & fixes

• Bug fixes, and preparations for upcoming releases.