WIP - more fixes. sometimes it passes ;)