Add regularity of headways
Fix name in scala calc to match django