TS merge pt 1

small issue fixes