S7 bug fixes

Fixed bugs - 
1 - cant review files with "-" in the file name
2 - Intermittent null referrence errors.