cmake packaging/minor source edits