Finished updates related to sanity check

including DIFF markup