first tweaks (WIP)