Document --depth better
Comment cleanup

Add some TODOs and remove an old comment