minor changes + comments before manual merge (broken master again)