armor changes, small bug fixes