mostly clilocal and tcmap pointer storage
merge