-- more little tweaks