Minor bug fixes plus rename Fs to Fs in helpers.py and measure.py