fixed some stuff and things