Performance improvements, added ability to turn on/off after elements.