fixed merge derp and optimized interactive settings