added vel update for fire commands
fixed merge and stuff