parser is now fast, simple, stable
everything is working now --- also cleaned up some comments