Bugfix pass and tiny armor changes.