Added Import JSON and more bug fixes