fixes from last meeting