warrior: some small fixes and optimisations
Merge pull request #127 from Rainrider/warrior

warrior: some small fixes and optimisations