addressed random TODO comments