Fixed garbled property names, noted a TODO for unit tests.