fixed getting stuck
merged changes in graph player