[FIX] project_id was not being retrieveed correctly, now fixed
[FIX] condition for many product types
[MERGE] with Pauls stuff