minor changes, removed warnings.