Minor updates and bugfixes.