made some minor changes (again)