Fixed Armor Effect issues

Closes #187