Organized imports
changed output order of attributes
Graph drawing improved
Bugfixes