More tweaks and new questions