Added abort, fixed goodbye