some pep fixes