minor fixes according to review comments