Fixed some rst finickiness
Small update to TODO comments