updated for new signal fitting, cleaned up a lot of files