Adding armor, fixing bugs