wip: basic fixes