smaller example running time
remove some TODOs i have second thoughts about
remove some commented out code