More work on entity rendering