Adjusted minor TODO's.
App is sort of finished now.