Bug fixes and progress indicator