Model tweaks

Better names for a few fields, added series_id field to event model in
preparation for calendar work
Another style revamp