Fixed action factories, added super() in constructor
merge