PEP8 Line Lengths
Minor Bug fixes