little cleaning. Good for initial demo
Merge branch 'unstableEdits'