more random number fixes
clean/refactor, Couple combat bug fixes