more PEP8 compliance
identify a few more TODO / FIXME areas that are broken