Thanks for your notes, Cosmo. They are really helpful. I will deal with them tomorrow morning and submit some more commits. :)