Minor many changes