fixing stuff and things