apply some user feedback suggestions