Added some more and elaborated on some TODO items
Changed the value separator for queries from ';' to ',' as ';' will be repurposed later.
More TODO adjustment, elaboration, and ammendments.