armour added and other bugs dealt with