More errors and mistakes fixed

Lantern should work now