Fixing default/current mechanism. Adding settings mechanism.