Fix TODOs.
Based on responses from Sherri.
Mainly unit tests.
Improve propel memory usage a bit.