Render queue, crude states handling, cleanup