Better AC noise stuff

Still not perfect, but it's a start