Fixed armour renering and clean up code
Merge pull request #3 from Rekkyn/master

Fixed armour!