Use correct preconditioner solve

We want to use the approximate solver in the preconditioner, not the full solve.
Some small changes to the way the forms are assembled.
Remove swap file