some minor changes -- cem