Monstro - fixes, new waveforms