Merge pull request #650 from UM-USElab/sunday

Calendar bug partially fixed
predictor positioning