Client bugfixes for the new catalogizing.
More bugfixing, some still remain.
Some more fixes.