Marxmode improvements