Progress indicator and other minor improvements