few bugs sorted going home