More changes and added some TODO items