cleanup
more cleanup, and add signal systematics