some new helpers and fixes