Added speed increments, fixed freeze bug