Restrict modelselection + some minor fix