finer logging and more checks
cosmetics and comments
fixed getSource - return a source even when it is not avaiable. (and no other is present)