SDK improvements & testing & clean up;