Adjust logging and add TODO