End Render Fixes

Still no indicators on the ends yet