Mostly integrated Noble Dan & Kate's changes, modify a few refs