Some misc fixes and adjustments (part 1)
Implement proper WHOX parsing. No normal WHO yet.