More tweaks, fixes