fixing a number of small problems and improving conflict email