Renamed and annotated some Delta/Signal stuff to make it clearer whats going on