work on dynamic speed, fixes