progressbars added, minor fixes
merge