Fix wrapper
Fix some things
Fix wrapper