some fixes/tweaks, just because... well it must be perfect