Bug fix for multiple file handling
Moved convertScopeData()
Removing some testing output lines

Also tidied up empty lines etc
Merge new feature of develop to gui