Nice, this addresses two issues with the first version.. Good job!