background and minor editor changes