Added raffle (fix)
Fixed errors and minor refactoring