Render Fixes, cleanup, Battery