Improved result rendering and other fixes