WIP fix stupid errors