Renamed study sessions to study periods

and other code tightening.
Resolved sync conflicts