And even more tweaks and fixes