Log more information, fix solver, etc
Some more solver changes