Added labels to progress graph and solved several bugs