Fix typo in method name
Do not display full path in "project" mode
Minor refactorings + Fix comments