[merge fuck me! more loose ends