pre-meeting commit! lots of small changes/fixes