Sprint -1 Fixing bugs