Some bugfixes and name changes.