fix reg and lang
Merge branch 'dev'