Added locations
Fix TODOs