A few things. Bugfixes.