Fixing Bugs

* Whitespace bugs from old MADZ master
* Parser Character classes to include digits and dot delineated names