Better getProgress(), cosmetic fixes