Added armor/ Fixed looping map bug