Graph update, minor bugs fixed