addressed review comments from panos and nick for the patches from bug 843004