tweaking a bit, here and there