Add service periods
Minor fixes
Merge branch 'master' into service_plans