day2 last fixes