more fixes. WIP