WIP more tweaks