- Added debugging info
- Changed source validation conditionals.