Added more conversion functions, added font wrapping, code cleanup