Incorporated remainder of feedback from Aaron.
Version bump