new version of helpers module with slight fix.
Merge branch '31-helpers' into 32
add mods for 31-cleanup
Merge branch '31-cleanup' into 32