various fix part II dhm/maintenance. todo invoice