Some minor tweaks and organization plus major progress with the syntax syntax