minor code tweaks.