Added crossroad + fixed minor glitches