Make model paths parameters of main(); minor fixes