Fixing up the ugly parser to handle properties properly
Removing some debugging code.