Added progress bar, fixed timer, added fixes