Added location support, fixed some bugs in the cutscene state transitions as well