added command and password parsing