Correction to keyspace generation.
Add default solver.
Get targets correctly.