Add Log and tweak others