Updated some filename handling
Update TODO comments