multiple certificates + cleanup + bugs