transition bug fixes
detail fixes
last commit: map not fixed
restore
merge