cleaning up a bit of TODO's and also Wrappers' constructors