more fixes, still not working
just for reference before big changes
work in progress