fixing bugs for first presentation