lots of changes and fixes - mostly described by the delta between the ISSTA paper and the future journal paper