add stuff and tweak