Added possibility to have both options and model options

Now possible to have both options of the type "OPTION x = y;" and "modelname.x = y;". Finally fixed reslim to be in correct place (can also be set in opt file, but this seems to be preferred).