Some reformat
Double buffer
Merge branch 'dev'