Added some converters, fixed some errors.