Adjusting Abstract Factory pattern...

Small issues, oops.