more updates to helpers and fixed some bugs in them