Removed bugs, added JON XML file parsing