@Badner: Thanks for taking care of this and your improvements. I took a quick look and the improvements seem to be good.