more cleanup getting ready for 0.97.3
changes for 0.97.3