Added Kadira and revised update function
Added notes, revised settings