Under the hood improvements on their way

Almost back.