bug fixes from last night