Further parsing refinements.
A few more tweaks before I start the bot portion.
+licenses