Added custom prompt; fixed handler for unknown command