minor changes after testing