fixed up converters a lot
mostly working
fixed tests