fixed another bunch of mapping errors
fixed a bunch of bindings
fixed the way traits are imported