bug fixing and pep8