some comments

tbd bla bla
location change bug fixed