some fixes & tweaks.