debugging
final fixes for mp6