Comment out bad eco settings & small fix