Some cleanup, and adding POP Buffer rendering.