Improved visual conversion feedback and some optimizations