Cleanup + bug fixing: global scale + render mode