Editorial changes for 1.2.1 release