improve preview rendering. updated todos.