Progress indicator cleanup, some state problem still, may just remove those booleans