cleaned up opts mostly