fixed these and closing it out #704