fixes and MXML parser refactoring