Tracking Progress and minor fixes