improve ! and c-l maps