Incendio changes/fixes, A4 almost ready