minor changes / todo notes