More small bugfixes and updates.