some minor changes and fixes