a couple more parameters + better velocity limit checking