added timespeed and scale
merged equationator changes