update for 6.0.1, plus vastly improved logging and naming of things