fixing stuff WIP