cleanup imports
many small but very important changes to get demo_mock to run
more fixes for fitterutils to run  demo_mock_params