wip
update fixmes
wip