pep8 complient, faster table and bug fixes.