half-working fullscreen mode
merge and small fixes