Added a progress bar and a counter that kind of works
Fixed some bugs