Numerouse fixes for features and factory