progress support / some fixes