More changes to enable PEP-8 readiness + small bug fixes