Fixes #7 - Last round of minor tweaks.