Initial tapering work
Stress drop fixes
Syntax cleanup with astyle