header interface + structure fix
Merge branch 'interface'