more status update hooks + better commit strategy