fixed sprint2 issues