Big fix in converting (its faster and much more failsafe now)