fixed helpers and scripts issues