cleanup; region fix; riot object extended