progress management + fullscreen support
fix merge issues