- Cleanup
- Render fixes