wrapping fixes
fix font loading
merge