fixed some stuff and broke others