prefixed helpers, huge cleanup, added new helpers from DW