Slight changes, bugfixes.