Added TODO comments and changed app title string