more fixes & ZPP support