Added a couple TODOs
Took care of a couple warnings