sprint 2 last fixes