Updated armors, cleaned everything up a lot