Progress bar and few bugs