Open files in context, minor improvements