Fixed an <undef> in the logging
Changed how Scopes are detected - removing two calls to findInProgressshort()!