-minor changes and adjustments