more tweaks / tests