WIP: close to final tweaks