bug fix
major feedback update