WIP fix a few bits