more defailing
cleanup
Merge branch 'defail'