Minor updates & tweaks.