Updated studycard week parsing and other minor fixes