Major improvements to WebFX parser (will eventually be merged into WebFX 3)