Many minor fixes. Added progress UI.