Improved file location code.
removed debug statement
shortened date
Pruned TODOs and outdated comments.