Comments and tweaks from Anton and DV