Your first point sounds reasonable, I'll see if I can implement that. As for your last question, you are right, that's not supposed to be in there, I'll fix that as well.