minor changes, fix for ts needed
typescript fixes