clean-up and a minor bugfix (signals were zero-padded to longer one, but should be cropped to shorter one)