More changes and fixes.