A bit of tidying up, echoing commands, etc.