Warrior Next: Bug Fix

Various improvements.