A few pendantic changes...