lot\'s of minor changes