small fixes after tweak
wip
refl done