further tweaks + tests