Cleaned functions, added complex dice rolls