Improve guess list, fixes #2