Fixed armor registrations, renamed int i to int id...