Small changes and bugfixes.
BugFix.