removed isaac, some other small changes