some todos
Merge branch 'dev' into min