misc changes added new helpers