projectilefactory fixing
merge