updated todo's in wrapper.py, renamed some support types to make sense.