minor changes and fixes