misc changes and solver stub