fixing stuff hopefully