Fixed param passing to edit markers; minor improvements