Added a default gen to everything, and fixed mistakes