removed typo
refractored solver into two subcomponents and improved debugging
make trailing ) style consistent
add scoring-function to solver, provide a stupid default