Cleanup & added the research of pech.