I was just trying it out from first principles but can see where I've gone wrong, any tips for the second query I mentioned or any tips on removing unwanted harmonics

 

One way to reduce the harmonics is to reduce the clipping by reducing the amplifier gain to the point where the circuit just starts to oscillate.

ak