bug fixes for backstack
removing todo
merge