general improvements, moving things around