Added video support, fixed that wrapping thing again