Implement whox, and other fixes.