Error on invalid options GH and small changes