a few changes and fixes.