More grammar tweaks, starting expression parsing rules and fixed build system (again)