Bugfix pass and tiny armor changes.
Merge pull request #22 from KirinDave/1.6-orgen-bugfix

Bugfix pass and tiny armor changes.