fix bug in all statements also change models and all statements to allow for alphabetical order of statements