littler speedbug
misc changes
Merge branch 'jgooderham' into msharman