More changes and bug fixes.