Fixed UpdateScreen progress bar being slightly too optimistic.
Cleanup pass! (You know how I love doing these!)