more fixes before meeting