Auto-refresh when complete and minor bugs