general improvements everywhere