Refactor commands to use just spaces for arguments
Fix auth with server