first commit for github
cleanup redundant helpers
fixed merge issues