Udc devel

Some bugfixes to your devel branch. I must have missed your mails on the mailing list.