prepare to fix src & dst field type
Merge branch 'correct_types'
2 debug pages done