Fixed "take all" problem caused the Numbered Disambiguation fix, following http://www.intfiction.org/forum/viewtopic.php?f=7&t=7741&start=15. This seems to work, but there could of course still be problems with this code.