Did some TODOs (notable: STD extension)