improved comprehensions, generator expressions.
fixed bug reported by Techtonik.