fix relations
fix wrapper
cleanup