fix: more ProjectTypes
and minor adjustments
#43
+602
−64
Merged