Fix PEP Errors and things..