Cosmetic changes and some tweaks

The Join class now internally builds an array with the matched symbols-
values. This may be useful in the future