fix some stuff and things