Made calls async, player fixes, code organization