some more little tweaks, work in progress