Eject method; bug fix; style