some feedback and some tweaks