Updates and bugfixes.