slight changes and fixes