cleaned up some stuff in PML, using project