Cleanup
Viewport syntax fix
Copy updates