The mega update - last-minute small bugfixes