fixing stuff, WIP