Minor changes
Analog signals now only calculated analytically
fixes sampling bug