Clean up and added Llort

Llort will have a turn off ability.