verbose options
Merge branch 'master' of https://github.com/Philosoft/philosoft
some clean up