Clean up some TODOs
Cleaned up the section on dependency resolution tweaking in the User Guide