Various updates on the Lantern

Still not done, but we're getting there