Added "single row" bonus
fixed out of bounds exception
Generators refactoring