more factory and other updates