Cosmetic plot improvements, and removal of old commented out code