Thanks. I'll make these changes for the next version.