Fix: Graph is not displaying correctly + some more little things