Clean up includes
Rename mcsampling
Add TODO and update documentation