Added todo
Fixed typo
Renamed parameter to app_name