Consolidated stuff, and cleaned up code. Tinkered a bit with Newton schedules.