various changes, ROI, tests, better look