Fixes for upgradable powers

* Fix increment bug
* Include upgraded powers in calculation of available power points