further TODO extraction and now surface_deterministic.py runs