again, some little tweaks