Fixing more bugs
Progress indicators