kleine fixes & cleanup + doap records