Progress bugs fixed