Added TODO, cleaned up more settings stuff