numerous changes throughout....bad commit