update comments
refactor some generalizeable tools
updated for new helpers