WIP painting, elements context, fixes, edition...