bug fixes, disable feedback