/roll is now simpler and bug-free

Also did more refactoring!