Various updates to the lantern