fixes
fix
notation
wip
wip