Last tweaks and fixes before bed