Fixed + and * to work with floats as well as ints

Even mixed together!