removed echos, fixed quote bug