sprint 3 fixes