removed unneeded echos, fixed store