Improved witch choice, added hunter choice