minor changes and updated spatial solver file