Fixed! With a few other improvements as well. Please keep the feedback coming!