Fixed several editorial sloppinesses