1.5.0.20 dev

couple of fixes and formatting.