more or less works now, except for text placement in graphics