Added Text Rendering and Cleanup