auto-comprehend now also supports markers
Several improvements and fixes for markers.