minor changes and additions