Lots of tinkering, improvements to converter