added some features to the wrapper
cleaned up