Tidied up graph output
Cleaned up auto complete
Merged