Fix and improve doap