Cleanups + dualmon support