Added feedback insert statements

and also some bug fixes...