More random, more fun earning - fix bugs