completed all fixes for sprint 2 - feature release