Fix minor bugs
Refactor roulette roller to separate module