Some minor simplifications
Several more corrections