small changes and clean up

app is not meet all requirements now, but does not crash
Merge branch 'master' into gh-pages