code review comments
cleared up few todos