added custom armor and some cleanup