some tweaks to back-integration movie maker
linewidth tweaks
fix merge conflict