update cmake; fix convenience funcs
Merge branch 'new_branch_name'