Lots of notes for two Goertzels, attempts at other improvements