Last few fixes before bed nothing big