Fix Exceptions
Make Progress Tracker Better