resolved / removed some TODO markers