Make PEP8 happy, fixed a couple misc things