Cleaned up parameters.dist
fixed parameteres conflits