Towards stabilization, grammar and XML structure needs work