mike's edits
misc fixes