Logic fixes, formatting

-Powerjack now gains the full +10 even when ubercharged
-Heavies now get minicrits and crits again
-stuff