Fixed almost all of Matei's feedback