Fixed Rendering Bug and Updated TODO