Added TODO notes based on app feedback