Clean up comments
pep touchups
state sync problem resolved