Added more commands; cleaned the project