Marker fix
acp design, fixes