You're spot on. These are two of the things I intend on working on next.

Thanks for the links.