userfeedback updates and bug fixes