Up do date

Organise imports
Server fail shouldn't crash system
Graph work proper