Added constant move factor
Fixed main loop