Tidying up the command line interface
Adds spec_adaptive to list
Merging updated spec_fun from monolithic