Some bugfixes and updates.