small changes and added a todo