fix allowing opts as input... oops
We don't need that code anymore
Much updates