Enhance flippy & some niceties