Minor changes & tweaks.