merge fix_printing into overlay -- TODO: Write tests