Fixed client. Input parsing on its way to elegance