export, layout, fixes