Good points, I'll make these changes