fix dumb error and more conversion issues