Armor pushed and functional and some minor bugs fixed
added armor and change other small things