Added rest of winter timetable info for arran; some code cleanup.