committed attempted fix to some tbs problems