some bug fixes EP