zrrichards: Fix grammatical error in comment
zrrichards: Added a TODO and FIXME, need to verify