Shale/1.1.0/todo cleanups

cleaned up some TODOs