minor updates (amini's feedback)