More commenting, editing