Added a few little fixes to make things easier and a way to test the linearity of energy versus signal. Turns out it's linear. Good deal.