Fix random generator
Better controls