fix and tweak