Fixed armor bug, added location <- needs testing!