Fixes random and moves concatenate into string
Reorganises Operators into Maths and Logic