more bug fixes from over the weekend