Added TODOs, removed S in importance sampling mc integration