Fixed variable names, changed solution settings