fixing stuff, hopefully...