slight changes and fixes.