Moar addiction fixes
Powerarmor derp fixes