WIP - fix eager font and image parsing, part 2