changed some comments and the TODO list in App.java