bug fixes and updating helpers