more fixes, almost there