fixed max speed, removed warp pointer
merged with master