Don't skip single letters
Fix name of an attribute and PEP8-ify
Various improvements to speed up and avoid duplicates