more bugfixes.
andstr wasn't defined globally, so didn't work on enum.