Bug fix, and implemented remaining conversions.