6pt upgrades

This solves #250 and #360.