improved Options.hx