Minor fixes. Need to test motion extraction and computations.