[main] Fix partial commands being valid + improve help display