misc fixes and viewport for scaling