Added new type of bonus.
Some refactoring...
A few bug fixes.
Added new type of bonus, the diagonal shaped bonus.