fixes from review comments