another tedious fun with overlay flicker-fix & some cleanup