Re sorted functions

and broke options....